From b564dd853c52c3a2e3e1fd35a4f951cb128c0641 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Thu, 19 Oct 2017 15:15:13 +0200
Subject: [PATCH] Avoid super-luminous pixels

The color-matrix shader was creating pixels with r,g,b > a in
some cases, which leads to unexpected test failures. In particular
this as visible the opacity render node test for opacity 0.
---
 .../vulkan/color-matrix-clip-rounded.frag.spv | Bin 9676 -> 9568 bytes
 .../vulkan/color-matrix-clip.frag.spv         | Bin 2824 -> 2716 bytes
 gsk/resources/vulkan/color-matrix.frag        |   3 +--
 gsk/resources/vulkan/color-matrix.frag.spv    | Bin 2824 -> 2716 bytes
 4 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/gsk/resources/vulkan/color-matrix-clip-rounded.frag.spv b/gsk/resources/vulkan/color-matrix-clip-rounded.frag.spv
index 2025e85572dbdf2eac118d497f3a56de4b3feea0..d25714ea8fedd85a121a86dc2c1b2d698e733cab 100644
GIT binary patch
delta 921
zcmZ9KTT5F(6ot3BcnM8G5Nz>6Gz0|6s~E&W@j<i?N)dc3h&j=K=A<XF_0sm#R(+TA
zJBo<E!1qFbLBYS_i@LsX4g@D>n6>uWd(WDg{QYpZTFhq317>~t7471(xIDbyXBKK6
zXdY>vTnCT26{6eWUKp8K-f}LZ*;)@fj_0i-z1i9b4!Z|Y;A3=fv86DK>eThyQSv80
zT03#d68+X1jZV<@UB4;b-io&NJ^%iK$I1WvY%<e-7UO49S&U`xr<dbr`dM~5e5!}z
zjeITAv+ks?9nLw7mhl>HQw=QbW_I8<^L|extE3Ul1(|?jj95v$C9KbM!A^&BwZz`q
zkhPO)p&Wk}ZEI2yA!!h!BOL1tI32J~i2Os3IVw7wN7HBM#~!B+;T%Dq&FMjO#N=OL
zqRPdmF3Zxm_>_-}$31*7xi5^xi|UTct|kuQRD2P};ikH?>sMiNh`-a#uoE%zas5LW
z$7t*dN2B(qFmBOs0Iz8mX`k#=WJXCeq>zNv#BX6Pn!;aN;ovi^)YbG)WP@|zl2&ri
z$l(FcZ-!r8y_rgV)D@~IZOsPlqi~=}tez}ZMym}U+18p?><B+s47rVV#fdeN)5=&0
QmS#46=7Zh>Jg>KT0$LAeod5s;

delta 1014
zcmYk4T}xC^6o&VFoH4Bl%t8k<%t;WW+fX85@Io|bB!aF*&)AgCu`@F@_Td?`EcGH{
z{{nwNfe77qAM_XMSM&jWyw7eQaL+9E`>uEGb>6+s`MU7=W-*s7_ZXAWuV@b573ccn
zj4>_66UCOIdldf7&y!t_)}q)L6PUcKs5cg)rsIL>NUt~Ugq>D94t<UeE;k!R@e1b(
zX3M@021{M1%+jw~t2M)x@49V&2a^}*|5_CrOYzdWSN7~k;cbG8OUkh3yo-|@7i0fr
zr^7Fw;5edQoAjK!-&u$A4x?qghR0L`OFN$I`IN0Z6v?URyyCh{z%fQ{RJ<vyztLEo
z4rid`N~YJe?bW_=@<_C;;KXAjEpl{(W1R)31J+4V|J-A)iVo*h>2J^zk5h;6uFqZ5
zYtR+#m%fqWwsNV<vMrq+PUv<@T^N6=Tom8){DyQ~ZYppHr|zjR4)3ZvPkkm#4fz>O
zh9{Au9@jg<I7WM+9WE_#hhK?c7xATb__Q8F<6Yqi?KI>ddTQd0FoWhC7l4B?&$(%R
zfArWF9@S0_8a2GY{mk*XGarU3A9aaa(pQvQRxAjAS4~Zr^-GsP3l-#kXrSPV&do?)
zwTEK^!98VGZDo9*zp9bm7Q3&g6ZYGc!OjDpp^h8iY)yDvdsUwad|jLzwR!PCQBd%y
Z;hI`%e#$}Wggx!o5T@pjbnukPn13UlbN2uM

diff --git a/gsk/resources/vulkan/color-matrix-clip.frag.spv b/gsk/resources/vulkan/color-matrix-clip.frag.spv
index ec29f263bbba778e7ab642765ce84ce77d97e369..a9bd797c0062d81f3dcdd322f2b24c8e915d84cf 100644
GIT binary patch
literal 2716
zcmZ{mX>$`t5QYa^5@)z<11S=aaKasjLmZC76$NAxfdn>jP84BDc&nt9N?JScjeN_e
zRPi794f$&!RE6SwM$=}as*I~W-EY6s-P_Z<_T<FuR_C_p=L1)FqqWaX$aZe0%lW-r
zS*pwpljdCU(m5Er-J~bN+2eM&jCQ2kh+-Ti$!*EElB(o^WUtP^Q8H<h%HZ591<2@p
zxl%7ztL4h=`f9&lA12Q`t$HVlTlHo%XsssEMho7y6fcTbJL}CfAuC3@hOBDetsJYJ
zsDE;!ePLmvU0jfzRqkEd`@Ny`jGkJYUZ*$kzU}US+4XKC8AQ)?wz$x37mFbPXQqtf
z&*a>++2M>##m>2zO}y7`4_nCy&-nhl&zbSPisG6o;#}6<)gHymt!K&lK#%S*dg-xJ
zuQzCp;?vtGE>ZnGU##cme7^%;wZzo@Q2u^n(CB(z#x0H6kH+lp$Lt^fW9Qt@vTN(Z
zwNfu0CXG0u{+#lFv$`97*&`ma!d=v#^w#6%a1&<^JpNnMOxD1+`twYf$JbiX(={Jj
zeaN`S!u!gp&6Q;{Yez7&u$jBGO)rn()WVNl@Ycwtukfj_tl6Na%ne+0eAI}KIW`|U
zzMN!HTzlrMx3in}tZdezsy7brz}^%_Zg@9S7&*aeDQq%eziOu*;=!BJZ}x&PIOqqY
zQCnVeQ1y`$8(&`bHtk>t{_WcF^A6$Pp&cK1LACD;I_K~m5{GBNZ)f&N=L~p3(e`V{
z4<8@<jM#^@=OwH&!Tv}(wUhf}?ZlxT{Pr9&^{!3$`=jO)fx|iD6(PA7H;D6<G<?*s
z5bRRG@P93Ri-cVGv6&yR4|VE}c5-8<m)VCEy(|Yj;w=Ue81b<02F&6!Z=8pJKj`!e
zKQ=RGe(oOK>c?j8z>cUg?w_;xO^EwTu<;WY`*FZ7>n@oA?u<o$UJGGv;c`cOC#)yj
z8{Y}D@$;Q9n|a_nVK#og6WG@judMwW34Oo@uSn>_in3DoJqaA}>#B(SVDNdqWeI)3
zM=jX+IQyN1p5UV{?0IFuw<6(tPCU-xw;Fzs&Ruhk`mxceopbZ*FEM_S@Xo`*2ZtE~
z|5rD0RYFhU!ejBSToI4n@V5q?zVNq(UhmOv^&blOTjA*Gc+}3~J+c^6LFZnkQ}~Q@
zVjt9gOZD&$@qL2NyG1@``KSc^FL4Umj|D8R{cqLziFVc-@$t<{z=(}*u|JhQ9{ad3
zaC^3sfm2l{PDno`0Yg~KF|$}xW%y4^h+*=FY6L$c;VgcOeO5a8tLi+x|4ae~m)T~X
zd0yt5JA(`7A7!-XVJ99lHYcH<7XNeUoO!88#6Ks218$u2(&_u}fpbARJaEeiX8eoN
ziCGKtc}aSHOw4y#cyUa2sgKlhMMCd*R$>wdzU9Pk_jFY{Iny&RFB{zI`XX@bp7=ir
t3}M+l{Tc4#OJQ(`V==BtCy(97b?<Wy?*HA#h%<VRZ-n!_2k5*9?*L;t)_(v1

literal 2824
zcmZ{mX>$`t5QfLr!5J=tAq624PQn=nh&UVvFqo7aA|i1l5Fn9-4!l*;N+qog`Idak
zr&Q%X@EiDRIjW#|pV73lsEVQ5)BW~4-Mu}%D>Bn_Tb!HHzYko?jn`f`E!(*rF7Nkp
z<z8iel(gnc7tX@i<uaZKXSdt#vf7beBZ_gXNN!1LlKYY$C3|!Rj*>~sD1&n^6(Fng
z<x0I=t(Gg_)SH7reU$v#ZP&X|+^)BxVY`_`8*O-7Q@ki{cGp{JLQafy4LQ}mOF5d|
zXmDbqbAEB7Q(BarQ|_JG2mO)ste#q&ez!mLzHM&S?0T<}45Jr1TUzXON~I8hGc(5V
zXYy{p+2M>##m>6}n|Qy|8MTu!p7s6tKWEnWDvE2Wh;upjz4j=+-+qy-5B2CCqn93A
z?)QhSaeR6k#miKG+ZXG(dEf7VS1mDhKahXW7&dyImvs*(>_-#!&l7h29XszDvTN(3
zwdH<1N*ZxO{dwg9XZ1D)vd27Tg}bOf?XSnJ(I(Cuc>H<PO4h))`14Gd$Jg4?vo#-D
zeaO0|@PTq_b7k4g+EENGZ00U))5~KxweVvXy*0M!D}3rJYc}X9a|0J0A2s4*j?IUT
zFE3dU*Pc1&?cAn4C!4jR>W#xYuqTC)8{Se1BPSU3+1X6MR<%<P@!-wqFMClK9Q0Xf
z)K-ujRDI;c##fNNRXZ4hf17svyhHf6YsUv(RP8&0&N+OC#Niq6+nK%6IRjo)w0+v~
z!^g*dK<vZX3li4pU>}iA?d1MQJ8`H7zdeUcy=&9{{;2tQ;Bd}(B}neKYs4u_!$%E^
z!De18&$rU2B;>-6eJfxe>eP4A$qgsH%s#A06*=IM?{*-85f7VrV_AIelk@QJ1)YB3
z$7bft|3lENer)Cr|4~)e&~A4C2O;j$pyMYlb~9iXb(hQlcgCU@{|I4j;c`cOC#)yj
z8{Y}D@$;Q9n|a_nVK#og6WCW2k6u(I^Z^_Ej)XouP*!TbD}e)kRTYsR3_j2IlZ3wD
zqZVv@oP8{zC-|rfdqG+7J(0{xh{rknR>LpSxogf*KQ=nGb8bQXCB~|RcODKtILy$h
z<h5?%vV@+(g~#Guxg;LF;kO2zzVKT^uXk&=`VR&Cjd1jIJZfk09$Ac;pmQ(#Q#ijh
z#6GC~y6WK_;`;=jcZ+<?^2ZYJSK<`49}8GP``@bb6YZ@3#K$)$0V6iL#r{<KWbDs`
zf!nj42%M@qaa{UI2^hkfk}!)kRfhkRgcv4&s7CP963*hc*k`1ZzpBpD`_Cm{aG7o9
zndi+&xHGtL{#8bM9(Lj}WAhUFY4N|1&Y8ayiTGzFaKMdoPC9-6J#fxThX-ys!HoZ<
zbYj-Rd|r@Vm=N<_6keK;o$4dCT$0c`o|Txyfp0nS+dW;DPR{fUEXW488Td*%SV6)J
ze65|u4B+GcO<>Fby2ZXCeKPh{Vc_=6*8<08U`aL@!m=6oGu-ucVM~&6obfw;LpFKr
du9u~Q!F}Id!{M&2Zg#8brgY-*&Y|<py#=at;!gko

diff --git a/gsk/resources/vulkan/color-matrix.frag b/gsk/resources/vulkan/color-matrix.frag
index 00b7947286..8787eb443f 100644
--- a/gsk/resources/vulkan/color-matrix.frag
+++ b/gsk/resources/vulkan/color-matrix.frag
@@ -22,8 +22,7 @@ color_matrix (vec4 color, mat4 color_matrix, vec4 color_offset)
   color = clamp(color, 0.0, 1.0);
 
   /* premultiply */
-  if (color.a != 0.0)
-    color.rgb *= color.a;
+  color.rgb *= color.a;
 
   return color;
 }
diff --git a/gsk/resources/vulkan/color-matrix.frag.spv b/gsk/resources/vulkan/color-matrix.frag.spv
index ec29f263bbba778e7ab642765ce84ce77d97e369..a9bd797c0062d81f3dcdd322f2b24c8e915d84cf 100644
GIT binary patch
literal 2716
zcmZ{mX>$`t5QYa^5@)z<11S=aaKasjLmZC76$NAxfdn>jP84BDc&nt9N?JScjeN_e
zRPi794f$&!RE6SwM$=}as*I~W-EY6s-P_Z<_T<FuR_C_p=L1)FqqWaX$aZe0%lW-r
zS*pwpljdCU(m5Er-J~bN+2eM&jCQ2kh+-Ti$!*EElB(o^WUtP^Q8H<h%HZ591<2@p
zxl%7ztL4h=`f9&lA12Q`t$HVlTlHo%XsssEMho7y6fcTbJL}CfAuC3@hOBDetsJYJ
zsDE;!ePLmvU0jfzRqkEd`@Ny`jGkJYUZ*$kzU}US+4XKC8AQ)?wz$x37mFbPXQqtf
z&*a>++2M>##m>2zO}y7`4_nCy&-nhl&zbSPisG6o;#}6<)gHymt!K&lK#%S*dg-xJ
zuQzCp;?vtGE>ZnGU##cme7^%;wZzo@Q2u^n(CB(z#x0H6kH+lp$Lt^fW9Qt@vTN(Z
zwNfu0CXG0u{+#lFv$`97*&`ma!d=v#^w#6%a1&<^JpNnMOxD1+`twYf$JbiX(={Jj
zeaN`S!u!gp&6Q;{Yez7&u$jBGO)rn()WVNl@Ycwtukfj_tl6Na%ne+0eAI}KIW`|U
zzMN!HTzlrMx3in}tZdezsy7brz}^%_Zg@9S7&*aeDQq%eziOu*;=!BJZ}x&PIOqqY
zQCnVeQ1y`$8(&`bHtk>t{_WcF^A6$Pp&cK1LACD;I_K~m5{GBNZ)f&N=L~p3(e`V{
z4<8@<jM#^@=OwH&!Tv}(wUhf}?ZlxT{Pr9&^{!3$`=jO)fx|iD6(PA7H;D6<G<?*s
z5bRRG@P93Ri-cVGv6&yR4|VE}c5-8<m)VCEy(|Yj;w=Ue81b<02F&6!Z=8pJKj`!e
zKQ=RGe(oOK>c?j8z>cUg?w_;xO^EwTu<;WY`*FZ7>n@oA?u<o$UJGGv;c`cOC#)yj
z8{Y}D@$;Q9n|a_nVK#og6WG@judMwW34Oo@uSn>_in3DoJqaA}>#B(SVDNdqWeI)3
zM=jX+IQyN1p5UV{?0IFuw<6(tPCU-xw;Fzs&Ruhk`mxceopbZ*FEM_S@Xo`*2ZtE~
z|5rD0RYFhU!ejBSToI4n@V5q?zVNq(UhmOv^&blOTjA*Gc+}3~J+c^6LFZnkQ}~Q@
zVjt9gOZD&$@qL2NyG1@``KSc^FL4Umj|D8R{cqLziFVc-@$t<{z=(}*u|JhQ9{ad3
zaC^3sfm2l{PDno`0Yg~KF|$}xW%y4^h+*=FY6L$c;VgcOeO5a8tLi+x|4ae~m)T~X
zd0yt5JA(`7A7!-XVJ99lHYcH<7XNeUoO!88#6Ks218$u2(&_u}fpbARJaEeiX8eoN
ziCGKtc}aSHOw4y#cyUa2sgKlhMMCd*R$>wdzU9Pk_jFY{Iny&RFB{zI`XX@bp7=ir
t3}M+l{Tc4#OJQ(`V==BtCy(97b?<Wy?*HA#h%<VRZ-n!_2k5*9?*L;t)_(v1

literal 2824
zcmZ{mX>$`t5QfLr!5J=tAq624PQn=nh&UVvFqo7aA|i1l5Fn9-4!l*;N+qog`Idak
zr&Q%X@EiDRIjW#|pV73lsEVQ5)BW~4-Mu}%D>Bn_Tb!HHzYko?jn`f`E!(*rF7Nkp
z<z8iel(gnc7tX@i<uaZKXSdt#vf7beBZ_gXNN!1LlKYY$C3|!Rj*>~sD1&n^6(Fng
z<x0I=t(Gg_)SH7reU$v#ZP&X|+^)BxVY`_`8*O-7Q@ki{cGp{JLQafy4LQ}mOF5d|
zXmDbqbAEB7Q(BarQ|_JG2mO)ste#q&ez!mLzHM&S?0T<}45Jr1TUzXON~I8hGc(5V
zXYy{p+2M>##m>6}n|Qy|8MTu!p7s6tKWEnWDvE2Wh;upjz4j=+-+qy-5B2CCqn93A
z?)QhSaeR6k#miKG+ZXG(dEf7VS1mDhKahXW7&dyImvs*(>_-#!&l7h29XszDvTN(3
zwdH<1N*ZxO{dwg9XZ1D)vd27Tg}bOf?XSnJ(I(Cuc>H<PO4h))`14Gd$Jg4?vo#-D
zeaO0|@PTq_b7k4g+EENGZ00U))5~KxweVvXy*0M!D}3rJYc}X9a|0J0A2s4*j?IUT
zFE3dU*Pc1&?cAn4C!4jR>W#xYuqTC)8{Se1BPSU3+1X6MR<%<P@!-wqFMClK9Q0Xf
z)K-ujRDI;c##fNNRXZ4hf17svyhHf6YsUv(RP8&0&N+OC#Niq6+nK%6IRjo)w0+v~
z!^g*dK<vZX3li4pU>}iA?d1MQJ8`H7zdeUcy=&9{{;2tQ;Bd}(B}neKYs4u_!$%E^
z!De18&$rU2B;>-6eJfxe>eP4A$qgsH%s#A06*=IM?{*-85f7VrV_AIelk@QJ1)YB3
z$7bft|3lENer)Cr|4~)e&~A4C2O;j$pyMYlb~9iXb(hQlcgCU@{|I4j;c`cOC#)yj
z8{Y}D@$;Q9n|a_nVK#og6WCW2k6u(I^Z^_Ej)XouP*!TbD}e)kRTYsR3_j2IlZ3wD
zqZVv@oP8{zC-|rfdqG+7J(0{xh{rknR>LpSxogf*KQ=nGb8bQXCB~|RcODKtILy$h
z<h5?%vV@+(g~#Guxg;LF;kO2zzVKT^uXk&=`VR&Cjd1jIJZfk09$Ac;pmQ(#Q#ijh
z#6GC~y6WK_;`;=jcZ+<?^2ZYJSK<`49}8GP``@bb6YZ@3#K$)$0V6iL#r{<KWbDs`
zf!nj42%M@qaa{UI2^hkfk}!)kRfhkRgcv4&s7CP963*hc*k`1ZzpBpD`_Cm{aG7o9
zndi+&xHGtL{#8bM9(Lj}WAhUFY4N|1&Y8ayiTGzFaKMdoPC9-6J#fxThX-ys!HoZ<
zbYj-Rd|r@Vm=N<_6keK;o$4dCT$0c`o|Txyfp0nS+dW;DPR{fUEXW488Td*%SV6)J
ze65|u4B+GcO<>Fby2ZXCeKPh{Vc_=6*8<08U`aL@!m=6oGu-ucVM~&6obfw;LpFKr
du9u~Q!F}Id!{M&2Zg#8brgY-*&Y|<py#=at;!gko

-- 
2.30.2